Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream sync #2748

Merged
merged 106 commits into from
Nov 8, 2024
Merged

Upstream sync #2748

merged 106 commits into from
Nov 8, 2024

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Nov 8, 2024

Описание PR

Почему / Баланс

Технические детали

Медиа

Требования

Критические изменения

Список изменений

Boaz1111 and others added 30 commits October 31, 2024 11:56
* no longer absurd

* Update Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

---------

Co-authored-by: slarticodefast <[email protected]>
* New workflow to apply the pr approved label

* Maybe fix permissions
…#33078)

* add notification for dependent wearables being dropped

* fix dropped item popup redundancy
- did a check to see if any item was dropped, instead of making a notification for each item being dropped.

* change popup to client-only variant

* fix redundant messages, add plural locale string

* fix conventions, fix locale input to be more intuitive

---------

Co-authored-by: Justin <[email protected]>
* Rebalance the max programs that a PDA can hold

* Give Caps PDA more programs too.

* Make the max programs a static 8

* I forgor sec and med

* CaseCase

* Empty commit to re-run checks

* The final change, I hope.
…ket (#33079)

* Make shark plush janitor-bucketable

* fix bucketed grey shark texture

* Make sprites less shiny and adapt copyright notice

* Made shark way way less shiny

* Allow carp plush and rehydratables in mop bucket.

* Remove old mop bucket shark sprites

* Fix post-merge bugs

* Fix errors

* Move ReactiveContainer stuff to shared

That should mean it is now predicted.

* Custom eject verb for the mop bucket

* Fixes OnSolutionChange, removes pop-up as there already is one.

* .ftl is not necessary as the custom pop-up was removed

* Review fixes

* Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs

* Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs

---------

Co-authored-by: Psychpsyo <[email protected]>
Co-authored-by: Psychpsyo <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
…820)

* the examineableDamage component now puts its messages at the bottom, and in color

* god help us if something is priority -100 :godo:
* Fixed trash not being spawned when throwing pies

* Completely removed trash component flag check prior to the spawn loop
* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

Co-authored-by: slarticodefast <[email protected]>

* Update dinnerware.yml

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

Co-authored-by: slarticodefast <[email protected]>
…ng job icons (#33069)

* :(

* Removed the sprite + updated RSI
* add IsMemberOfAny to faction system

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
CPUJob to come later.
PJBot and others added 16 commits November 6, 2024 14:40
…unds (#32981)

remove chair + changed maints db to rubber
* fix

* oops, used savemap instead of savegrid
* Fix reserach disk crash

* remove extra whitespace

* removed args.handled where args are not handled
* One line fix

* Removed redundant using

* Allocation improvement
* pass Actor to cartridge messages

* NonSerialized gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

* add vebr

* add access to the components

* 2/3

* fix

* relay damage from disguise to user

* fix integrity

* :trollface:

* :trollface:

* m

* kill integrity

* fix a bug

* review

* remove them from component

* relay flash effect to the disguise

* fix icon being weird

* change method since multiple systems cant handle same network event

* :trollface:

* actually network Disguise real

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
# Conflicts:
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation and removed Status: Needs Review This PR requires new reviews before it can be merged labels Nov 8, 2024
Copy link
Contributor

github-actions bot commented Nov 8, 2024

RSI Diff Bot; head commit 9b2b7b4 merging into cb477ca
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
muffin-berry Modified
muffin-cherry Modified
muffin-banana Added
muffin-chocolate Added

Resources/Textures/Structures/Machines/computers.rsi

State Old New Status
broken Modified

Resources/Textures/Interface/Actions/actions_ai.rsi

State Old New Status
job_view Removed

Resources/Textures/Structures/conveyor_old.rsi

State Old New Status
conveyor_loose Removed
conveyor_started_ccw Removed
conveyor_started_ccw_r Removed
conveyor_started_cw Removed
conveyor_started_cw_r Removed
conveyor_stopped_ccw Removed
conveyor_stopped_cw Removed

Resources/Textures/Objects/Consumable/Food/plates.rsi

State Old New Status
muffin-tin Added

Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi

State Old New Status
mopbucket_carpplush Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi

State Old New Status
storage Added

Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi

State Old New Status
storage Added

@Morb0 Morb0 merged commit 6a0b6ca into master Nov 8, 2024
15 of 16 checks passed
@Morb0 Morb0 deleted the upstream-sync branch November 8, 2024 17:03
lzk228 added a commit to lzk228/space-station-14 that referenced this pull request Dec 8, 2024
lzk228 added a commit that referenced this pull request Dec 10, 2024
AwareFoxy pushed a commit to space-syndicate/space-station-14-next that referenced this pull request Dec 12, 2024
* Translate Upstream space-syndicate#2748 (space-syndicate#2837)

Co-authored-by: lapatison <[email protected]>

* Перевод Upstream space-syndicate#2830  (space-syndicate#2836)

Co-authored-by: lapatison <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: cfif126 <[email protected]>

* translate borer names (space-syndicate#2835)

* [Localize] Poster 52 (space-syndicate#2840)

* Translate new diona names (space-syndicate#2839)

Co-authored-by: lapatison <[email protected]>

* [Resprite] Medical uniforms & rollerbeds (space-syndicate#2802)

* Automatic changelog update

---------

Co-authored-by: lzk <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: cfif126 <[email protected]>
Co-authored-by: MureixloI <[email protected]>
Co-authored-by: IanComradeBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design
Projects
None yet
Development

Successfully merging this pull request may close these issues.